Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 12 Jan 2010 21:54:22 +0000 (21:54 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 12 Jan 2010 21:54:22 +0000 (21:54 +0000)

Trivial merge